support qt6 with cmake in windows build script. (#788)

diff --git a/tools/make_windows_release.ps1 b/tools/make_windows_release.ps1
index 54ebefc0eac89b2901e6518ea0a9152b93f9b3f3..7c546623050bcd40973fb855519e15df5f357d69 100755 (executable)
--- a/tools/make_windows_release.ps1
+++ b/tools/make_windows_release.ps1
@@ -42,7 +42,7 @@ if ( "$flow" -eq "msbuild" ) {
     }\r
 }\r
 if ( "$flow" -eq "cmake" ) {\r
-    $Qt5_DIR = "$(Join-Path "$((Get-Command qmake) | Split-Path)"  '..\lib\cmake\Qt5' -Resolve)"\r
+    $CMAKE_PREFIX_PATH = "$(Join-Path "$((Get-Command qmake) | Split-Path)"  '..' -Resolve)"\r
 }\r
 # mimic creator shadow build to match Inno setup file\r
 # make sure we are staring with a clean build directory\r
@@ -58,7 +58,7 @@ switch ($flow) {
     #WARNING: Could not parse Compiler option '-std:c++14'; added to AdditionalOptions.\r
     "msbuild" { $ErrorActionPreference = "Continue"; qmake -tp vc "$($gpsbabel_src_dir)\GPSBabel.pro"; $ErrorActionPreference = "Stop" }\r
     "nmake" { qmake "$($gpsbabel_src_dir)\GPSBabel.pro" -spec "win32-msvc" }\r
-    "cmake" { cmake -G "Ninja" -DCMAKE_BUILD_TYPE:STRING="Release" -DQt5_DIR:PATH="$($Qt5_DIR)" -DCMAKE_RUNTIME_OUTPUT_DIRECTORY:PATH="$($gpsbabel_build_dir)\release" "$($gpsbabel_src_dir)" }\r
+    "cmake" { cmake -G "Ninja" -DCMAKE_BUILD_TYPE:STRING="Release" -DCMAKE_PREFIX_PATH:PATH="$($CMAKE_PREFIX_PATH)" -DCMAKE_RUNTIME_OUTPUT_DIRECTORY:PATH="$($gpsbabel_build_dir)\release" "$($gpsbabel_src_dir)" }\r
 }\r
 if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }\r
 switch ($flow) {\r
@@ -81,7 +81,7 @@ switch ($flow) {
     "mingw" { qmake "$($gpsbabel_src_dir)\gui\app.pro" -spec "win32-g++" }\r
     "msbuild" { qmake -tp vc "$($gpsbabel_src_dir)\gui\app.pro" }\r
     "nmake" { qmake "$($gpsbabel_src_dir)\gui\app.pro" -spec "win32-msvc" }\r
-    "cmake" { cmake -G "Ninja" -DCMAKE_BUILD_TYPE:STRING:="Release" -DQt5_DIR:PATH="$($Qt5_DIR)" -DCMAKE_RUNTIME_OUTPUT_DIRECTORY:PATH="$($gui_build_dir)\release" "$($gpsbabel_src_dir)\gui" }\r
+    "cmake" { cmake -G "Ninja" -DCMAKE_BUILD_TYPE:STRING:="Release" -DCMAKE_PREFIX_PATH:PATH="$($CMAKE_PREFIX_PATH)" -DCMAKE_RUNTIME_OUTPUT_DIRECTORY:PATH="$($gui_build_dir)\release" "$($gpsbabel_src_dir)\gui" }\r
 }\r
 if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }\r
 switch ($flow) {\r